Repository navigation
Sync latest commits from WebGoat/WebGoat - #46
Conversation
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
There was a problem hiding this comment.
🔵 Needs a closer look
Documented incompatible behavior changes in REST Assured 6.2.0 require Java 25 unit/integration CI and amd64/arm64 desktop-image build validation, but those results are unavailable.
No open issues 🎉
What changed in this PR
Syncs five upstream WebGoat commits into the fork, updating dependencies and build tooling while preserving fork-specific history.
Changes:
- Updates REST Assured to 6.2.0, Maven Surefire to 3.6.1, and java-jwt to 4.6.2.
- Updates both desktop image builder stages to Alpine 3.24.3.
- Updates the release workflow’s Docker login action to 4.7.0.
Runtime validation remains pending in GitHub Actions because a local Java runtime was unavailable.
| File | Description |
|---|---|
pom.xml |
Updates REST Assured, Surefire, and java-jwt versions. |
Dockerfile_desktop |
Updates the ZAP and JRE builder images to Alpine 3.24.3. |
.github/workflows/release.yml |
Updates docker/login-action to v4.7.0. |
Review effort: Balanced
|
Sync is ready and Copilot has been assigned; Copilot also completed its requested review. Merge is blocked because not all checks passed: the pre-commit job cannot install Python 3.9 on the current Ubuntu 26.04 runner, so the Maven build was skipped. The JavaScript/TypeScript CodeQL job also failed. The PR remains open and its branch is retained, as requested merging and branch deletion are conditional on all checks passing. No unrelated CI configuration or intentionally vulnerable lesson code was changed. |
Keep Python 3.9 available after ubuntu-latest moved to Ubuntu 26.04. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Summary
Merge the five new commits from
WebGoat/WebGoat:mainthroughbe2c186b94201bcbdfa46c3a6f5f53dd83262d6a, preserving the fork-specific history.Validation
The upstream merge is conflict-free and
git diff --checkpasses. A local Java runtime is unavailable; GitHub Actions must validate the merge before it is merged intomain.